Handling put properly