- Fix issues #628 & #629