Temp fix for paintings ArrayIndexOutOfBounds exceptions