Should this still be fixed for this version?