Possible fix with entity no-arg constructor