for timo
fixed constructor merge conflict