Merge solve issues with previous changes.