Should fix custom query