FIX FIX FIX for editor bug