Phoenix 479

Hi James,

   Can you please review the code for issue 479.

Regards
Ravi