We should really do that since the current solution is very brittle.