Added contribution for Andrei Duma