MOSYNC-2757 fixed.
Merge pull request #353 from fredrikeldh/ThreeTwoOne

MOSYNC-2757 fixed.