engine: Fixing issue #52