[GAIA] - Fix for Bug 1036370