fix #4055 (probably)