Fix for scanner