fix logical compiler warnings
revert