3 - Bug fix
Merge in public bug fix