Core fixed, so reverting to the original code.