Continued to try to bugfix