Bug fixed

There had to be a few remaining