Fixed APLOD some more