Ported to stable forge