BUGFIX: unfinished code path