diff --git a/src/lib/cd.c b/src/lib/cd.c
index 67b2a23..2d52fa3 100644
--- a/src/lib/cd.c
+++ b/src/lib/cd.c
@@ -146,7 +146,7 @@ int cd_get_ntrack(Cd *cd)
 
 Track *cd_get_track(Cd *cd, int i)
 {
-	if (0 < i <= cd->ntrack) {
+	if (0 < i && i <= cd->ntrack) {
 		return cd->track[i - 1];
 	}
 
@@ -283,7 +283,7 @@ int track_get_nindex(Track *track)
 
 long track_get_index(Track *track, int i)
 {
-	if (0 <= i < track->nindex) {
+	if (0 <= i && i < track->nindex) {
 		return track->index[i];
 	}