Fixes #105 and Fixes #76