Bug fix for forcing scan to run through skip scan