Small FIX for API