Fixed compilation by continuing 5ca3ae5