Remove the previous hack because not satisfying
0.1.8