Fix switchbuffer completion. Fixes #33