attempt to fix #2112, #2119