Fixing bug CT-005