Try to fix everything once again