Refact. Fix https://github.com/studio107/Meta/issues/1