Bug fixing for 0.1.5a