Fixed #19 since it became a problem