Fix order of operations issues
Bump the version