Peter's computer bugfix