fixed #85 partially