fixes commitment problems