Work around issue causing editor to not save