Fixing small devices refactor problem.