bugfix for issue #20 and #21