Second part of emergency fix for 2330