Quick parsing fix