Fixed the arguments resolving