Fixed errors in 848101bf1736d1c01eb86968e85a14c7466bb376