Bugfixing Swap-Class