REFACTOR: for 4.6.6