Fixes #233 (was fixed as part of 2.2)