Fixed bug with persistance / editing after creation