Attempt to fix crashes on some options