Last commit, eliminiated core dump.