fixes to case