BC-1619 #resolve. Fixed..