Fixes #452, Fixes #445

behavior