To solve the #161 issue