bugfix issue1