Fix the bug where it only work for 10+