Attempting to fix focusing bug....