Fixes Issue 75