Agreed, this was an expedient hack.