Fix for #179