Optimize
Fix argument cast