fixed bug from hartmann
ignored merge conflict