Fix for #176