couple bug fix