Integration

Merging a bug fix.