Reverted the Stretchy fix