First attempt to fix nargins problem, still not done