fixed cse issues