Fix for case 1234