Fixed the Figure issue