slight adaption to v7