Bug Fixing 2/26