Fixed a merge mistake which leads to exception