really fixing #721