Fixed cap bug