Fix for Ticket #953
No sure if doLayout is required??