Fixes top-level tailing problems