Tidied up Hub fix