CON-907 | Fix for hubs