Major bug fix involving clock rate