Solved heavy bugs (heavy...)