Fix for #257