Fix for PDroid