Fix support for RPI (first try)