@jbo_85: do you have a proposal for a fix? otherwise, I will take a look at vshift tomorrow (I'm currently busy with additional controller types)...