Temporary fix for dev.
NOTE: This fix should be overridden by any commits in autosave branch.