Fixes Issue 61