Bug fix
Merge in change