Even better fix, fixes unit tests too