Minor refactor fix