fix bug #109
fix bug #113