Shorthand Echoes Fix needs to be merged