@caitp I think you are right, will post a simplified patch