Fixed fitrure ordering and path