Fix for #266