Fixed errors from commit fc75c29412428c6a70ef6265ddabb699e424f63b