Prevent using potentially unintinialized pointers
fix: better animation support