Minor bug fix when no schema