new fixes for this stubborn editor