We probably need to address this one and the one below in another bug ...