Improvement on slim fix.