fixed #23