Scanner bug workaround (NEED FIX)