Fixed an issue occured during previous merging