fixed #294
fixed #295