safer shortcut migration