decoder figures fix