We'll use the offset solution. It will be implemented in an upcoming beta version.