Raw pointer fix