Fixinig issue 18