Updated CS fixer and updated code accordingly