however this fixes another problem. (Basically the offset wasn't being computed correctly. This is for bug: 1080 Kent