fixes #1691
partial fix for #1558
Merge branch 'master' of https://github.com/r888888888/danbooru