This probably needs fixing, but will be handled later in 3D rendering branch.