Got rid of unneccesary true check