Fixed Butchem's Issue