Fixes #19, copied directly from VCDB