[fix] [minor] fixed order of execution