fix previous commits for pull req. 24