fixed wrong references