Fix Encoding issue on Windows + add missing @Override