Fixed check on Entity

Ref. #19