the if block from 126 to 128 has to be removed