Fixes Issue 76