- final entity fix revs #1 (for the 1000th time :P)