Bug fixing for 0.9