fix for identifier conflict