Fix save mode - relates to #20