BC-994 #resolve.
Fixed