Fixes #60 and #61.