bugfix finally!