Rebuild from 1.0.2