Fix #353 properly this time.