fixes #16 and #17