JBTIS-287 - fix SwitchYard
Merge pull request #210 from pleacu/JBTIS-287

JBTIS-287 - fix SwitchYard