bug fix dec 12-13 2:47