Alias collision fix