Fixed files to work with new bugfix.
Finally fixed that pesky bug.