fix merge problem
anders change builds too much