#4137 Fixing end to end code