Feature/fix issue 2