Prefer fix from @tadeuzagallo