Fixed TheBDM closure issue