Issues/2014 do not pass entity around

Closes #2014