fix 2009 bug. 2008 still buggy