Fixed #19