Fix breaking change