Fix for All fires for 2010 issue #55