another station fix
Merge branch 'master' into test_ts
upd