fixed #104
fixed #105