Fix problem with .^name sometimes not working