Fixed: CS issues