Modified bug from Home DefautController