Eureka 2.0

Fixed one of many that are going to slowly surface.