Fix a nasty problem with refactored PUT operation