fix for commercial support