Fix Master HSolve