resolved the recent issues