clean up bug fix