Updated according to @juancarlosfarah's comments