Bugs fixed on save method.