Work around fci & company issue