Daniel bugfix spike