Bug with save method fixed