fix on some routes