add resolve fix