Bug with force average expression fixed