Fix for #115