Added Siegfried's fix on Properties class back.