Fixes #447.
Fixes #448.