Merged Karona's pull request