Updated according comments from @jcarlosgarcia and @juancarlosfarah. Refs #397.