bug fix
refactoring sample
bugfix