3.2.3 * Fixing regression bugs