bug fixes
Merge commit 'aa626221ddf1685b7a389d9869ac65a3c87646b1'