Fixed error of last PR