fixed CommonConstants conflict