fixed baghchal for current api