Fix for #284