Optimize the overall process (remove the intermediate step)
Bug fix