polish #69
fixed #74 in v0.28a