Fixed pontuation logic