Improved stop for the Hub image

Part of #10