Adding a test to cover Issue #513