Empty stations now working correctly