@christianv Good point. I'll refactor this to avoid the potential bug