fixed issue 466, 376.