Fixing issue with transform support