Bug correction + New build