Add work around so pk id is always first