fix #3433 (untested)