Corrected fix for #115