fixed train swapping (299)