Formula adjustment for 'shaped' replacement so it works in all cases