fix bug #24