Fix infinite recusion issue