fixing #397 again.