diff --git a/libopenjpeg/tcd.c b/libopenjpeg/tcd.c
index c0c4c52f..fa7154ae 100644
--- a/libopenjpeg/tcd.c
+++ b/libopenjpeg/tcd.c
@@ -1020,7 +1020,7 @@ bool tcd_rateallocate(opj_tcd_t *tcd, unsigned char *dest, int len, opj_image_in
 		double hi = max;
 		int success = 0;
 		/* TODO: remove maxlen */
-		int maxlen = tcd_tcp->rates[layno] ? (tcd_tcp->rates[layno] < len ? tcd_tcp->rates[layno] : len) : len;
+		int maxlen = tcd_tcp->rates[layno] ? int_min(((int) ceil(tcd_tcp->rates[layno])), len) : len;
 		double goodthresh = 0;
 		int i;
 		double distotarget;		/* fixed_quality */