Bug fix of VERP handling