Fixes Issue 46