Bug Fixes with Version 2.1