Fixed duplicated references