possibly a bugfix