Fixed the dreaded .comma bug