fixed tap handling