fixed #27
fixed #28