diff --git a/hardware/arduino/avr/cores/arduino/wiring.c b/hardware/arduino/avr/cores/arduino/wiring.c
index 1c3e5a52c..b956f787e 100644
--- a/hardware/arduino/avr/cores/arduino/wiring.c
+++ b/hardware/arduino/avr/cores/arduino/wiring.c
@@ -105,11 +105,11 @@ unsigned long micros() {
 
 void delay(unsigned long ms)
 {
-	uint16_t start = (uint16_t)micros();
+	uint32_t start = micros();
 
 	while (ms > 0) {
 		yield();
-		if (((uint16_t)micros() - start) >= 1000) {
+		while ( ms > 0 && (micros() - start) >= 1000) {
 			ms--;
 			start += 1000;
 		}