Compile fix from 475cd4f