Potential bug-fixes for infinite loops in metagenome mode

[kmnip]

I was able to replicate the bugs reported in #184 #185 and my PR seem to have fixed it on my end.