Fixed whiteListCheck (not tested yet)