Fixed the "double entity" bug :)