Trying to improve the handling of =>