fixed #260
fixed #254