Small refactoring, idea for fix?