Fix to Version 1.2