#1038 Test fixed