fixed some enable checks