Fix with @javisantana tips.