patching up problems created by previous commits