revert to bug fixes