Fix up package where clause