fixed some ALL checking