Fix for nextbus?