bug fixes
Merge commit '38df7e6e0377665a62af753e7c495d86c2793446'