Hack in scalar support