fix the screw-ups caused by 23e513c