Bug fixes without stocks
0.2.0