Quick hack to make it work on RPi again, proper fix following soon