Fix extract