Dirty hack to fix sequential optimizer