updated with failing test for issue 503