fixed BUG 972418