FIX: addresses #468 offset problem

Closes #468.