Refactor of this fix