bugfix maybe ?