History pass fix with magic