Fix complete logic nonsense.

Lets hope that this is the last bug in this new feature.