yet another bugfix