temporary fix for name conflict