Fix for stations not loading correctly