Fixed SELF_TYPE methods