Fixed Prepend switching, append still buggy