REALLY fixed Entity -1 is invalid error