fixed for david (i think)