Add a workaround for removing menu. Fixes #30