Fix bug with base