Fix for Github Issue 114