remove unnecessary check again