Fixed bug where are save was sometimes not possible