Fixing based on Garcia's suggestions.