More bug fix, think they are all out