fixed #382 #198