Bug fix.
Merged