Jeff bug fix

merge my code to master