Little fix, but found bug that need time to do it