Bug Fixes #17