Added proper null terminators