I see the problem, I'll trying to think of a better solution. For now I've removed this change from the PR, I'll send passenger related changes in the other PR.