fix: made to work with new router