fixed bug
Merge branch 'topics-js' of github.com:Djo/kaede into topics-js
fix