Fix for Defer Issue on Angular