Fixed #14 with a tertiary condition around the days until next expiry value