Fix to #560