Reverted to previous behaviour - changed the fix in mosca