v0.3.3 : minor code optimization