Fix for #183