Addresses 1 in #563