fixed #321