Related function fixed