fix of AUTHOR-5834 and AUTHOR-5835