Fix for #182