resolved bug #76
resolved bug #70