Switch to a real solution that closes #2