Issue 473

Fix for issue #473