Fixed bug from merging and rebuilt.