commit from ogeorgiev