Fixed errors due to merge a46caa515a