Bug with units as part of the selector. Fixes #1332