Fix #15#issuecomment-15674654