Fixe for lib/instance passing where clause