resolve properly