case related, bugfix