fixing new hubhub implementation