Added vows to FIX #14 issues