Fix issues #1 and #17