Improving antopts fix