Corrected Nikos Commit

I've merged the changes