another bugfix, hopefully the last one