Fix partly #17