Fix issue with creating entity on successful data array save