Fix cross compatibility issue