Working towards a bug fix