fixed fixture bug after refactor