Bug1

This is a pull request for tracking