CON-381 | Lazy rail bugfix