Initial fix after fork