#4137 continue tidy