Prepare for #2013 fix