Make it work with dwb