Fixing argument order issue