Bugs seem to be fixed