Example fix and improvement