Addresses #659.