resolve rfr#1241