Fix mode issue