Fixed issue with hr_layout