Fixed crash-on-save