fixed small bug in line 356, commented out line 192