Fixes #2757 once and for all