Game breaking issue with stats through skills enabled on latest builds

Should be fixed by this and this PRs.