Removed unsafe option usage