Fix issue with option prefix