Complete fix #4478