Fix #2081
Test for #2081
Regenerated build/