Reverted selection to avoid an old error where shapes disappeared