Fixed issue in core common passing stupidness back