Finally fix #2113