merged js
bugfix