Hotfix for #180. gg lack of validation