#1091, #1095 Fixing loading of custom options