fixed bug in timer, should always work now