Improved station detection