Fixed for refactor