CASE: fix

some bugs fixed