Fixed argument delegation closes #13