Editor: Proper fix for #193