lock/unlock/save issue now work as expected