Fixed according to revew comments