temporary fix for offset bug