fixing corner case of splash handler