fix v7 compatibility