Code fix for next release