work on 1.0.4