Clean up bug fix