Fix bug with support