Fix for #287