Suggested fix is in the rt45602 branch, please review.