Fix for #185