Commit 3.3 Description: Bug fixes[3]