Refactor last fix