Bug #2 fix
Merge