fixes #16
fixes #17