solves issue #20
solves issue #19