This is ugly, but it improves the current setup.