Possible Fix for #115