Bug fix, no more empty cards