fixed bug #14