fix #3488 (mostly)