bug fixed, kind of
Merge origin/master