Fixed up bug