fix some issues related with direct call