solid fix for focus implementation