Fix creature check bug

This commit fixes issue #345, and might be related to #340 and #341 too.