Fix of fix (damned crutch)