Fixes 27.
Fixes dist merge conflict.