Ah yes. That seems much more elegant than this mess. Will fix it soon. Thanks.