#24 - modification after merge in order to work