fix leo hardcoding stuffs