Fixing the enemy/object debacle