[BUGFIX] Version matching