another bugfix redo