Fix for #89 - timer running slowly