Fix and shorten