fix version + fix order