Fixing transformation issues