Bring back inline with MateJ's fork