Hopefully a fix (#48)