Change otption position to prevent end of line conflict. Hopefully.