Previous bug fix now actually fixed...