fixed implementation
0.0.4