Added a test for this latest fix