Fixed: Use one function