second try to fix cleaner FC