Fixed a know issue that may have caused bugs.