fixed bug #19 and closed