Home tap fix