Fixed breaking change