fix for octopus issue #36 Current shard is reverts to master unnecessarily