fixed optimized assembly