v2 - Update for bug

Bug-fix as found by J.