Bug fixing, v2.4