Refs #14. Fixing execution methodology.