Unfortunately this doesn't fix the undo problem