fixed some bugs on Focus