Fix for issue 602 during initial install