Fixing the sytem