Fix compatbility