BC-959 #resolve.
Fixed