Added returns to stop phpstorm complaining