[imp] Peters patch + backward compatibility fix