Fixes #71 and Fixes #78