Fix#3373

Provides a fix, a unit test and three test assets for issue #3373