kinda bugfix
full bugfix