BugFix: nested case