corrected merged Eugen's commit