This is just the existing behaviour, isn't it?