prototype conflict fixed