Finally solve the skill resolution problem perfectly!!!