@Wormnest since you looked at this file for a previous bug, maybe you could review it. If not, I will merge it in a few days.