- Fixes issue #628 & issue #629