Fix bug: don't double transform