Fixes #19, entity.check

(not tested yet, waiting on more information)