bugfix time again