change according to fficxx-0.2