Another fix without copying files