Fixed entity proxy object returned on save issue