Task #0066: Make system fix.