Serious fix to bug of misnamed class