feature #1791: proper state checking
feature #1791: proper state checking for simple save action as well