Animation fix, data null fixing