improved capsule fix