Try my hand at fixing redmine #123