Editor: Duplicated code to make sure Mac issue isn't happening. Requires testing.