fixes suggested by @hjdivad