Dimswap bugfixes

Fixed dimswapper