Fixed cap bug...