mini refactor to fix few small bugs related
0.6.3