Fix arguments treatment