This version fixes the following bugs: