fix bug after co-work with janice