Fix for avr