Fixed prefix handling.