dependencies + bugfix