fixing corner case