adding fix for non-X terminals