Fixing with @javisantan comments.v2