bug #135 #138 resolved