Nasty bug fix!