Fixed error generated by other commit