Bug Fixed with formating