2.3 another bug fixing