Fix save mode - relates to #20
Fix save mode - relates to #20