bugfix for eureka/issues/25