Fix for #80 that also works with vendor specific keyframes