fixing normal case