Added BC from 1.0.4