Bug fix and add methods.