Fix, refactor