fixed #24