Fixed issue on last PR.