STORM-80 : Fixed db load issue