Fixed fatal bugs introduced in 1.2