fixes #18
fixes #20