Better handlling of 2012