changed back harnek's fix
Merge pull request #834 from corinnecurcie/stable

changing back harnek's fix