Fixes #132 still need validation