Fixed issue with station