removed focus re #16