fixed #18