resolve bug #36