Fixed: timeline\controller