adapted to most recent vfs improvement (looking for better performance)