Fixed with Schaffer specification