the magic fix
merged