SWOP hotfix
Merge pull request #189 from LocalData/swop-hotfix-clean

SWOP hotfix