Fixes #456

Fixes for Issue #456.