Fix for strict argument passing check