Small tweaking for consistency