fixed things slightly for 0.9.7, but still broken