Yes, that was our workaround as well.