[SQUASH ME] Amend for #1000