Bug fix and design change