Fix for focus