[0.6.3] fixes #17 and #18