Fix for #280