Option load fix