#1138 Fortified code by specifying schema always