fix #133

This will fix the #133 (but I'm thinking to a better approach...), then I will look for the #136...