fixing #5324 and #5325