Update schema issue31

Fixes issue #31