Feature/pos fix

Fixes #388