Swap count fix

Addresses:

Issue #6