Fixing amd return