Cleaned up #220.