Hopefully a bugfix