Works with own fork