Fix for #259