Bug Fixes #2