Add a hack to fix a bug with wbar