Fixed #17, refixed #19