Changes recommended in issue#54