Fix the rudimental support for focus