Right, I will fix it. BTW I recommend to add future task to clean up this module.