Minor improvemnet