Re-committed the bug fix