PATCH: brought over bug fix from nakul

fixes block data manager bug