Horsepill parser fix