BC-1596 #resolve.
Fixed..