Fix #92#issuecomment-28949508