Temporarily fixed an issue where BaseCards wasn't updating properly.
A more complete solution is still required however.