Based on code changes from @julesvanirsel to ensure these continue to work correctly.
Based on code changes from @julesvanirsel to ensure these continue to work correctly.