Fixes a regression in 2.1.1