Fix to comply with coding standards