Fixing possible performance overhead