CEV3 Issues #52 & 53