final bug fix of the evening