Re #9159 Fixed issue with tube orientation - for real this time