Fix for #282