Sandcastle fix