Final bug hunt

Solved bug