removed weird behaviour #60