Fixed(?) some route calling weirdness