Fixed crash.
Fixed conflict.