resolved issues after merge with bugfix