Feature/fix issue 3