Replace sequence hack with less evil hack