added fix to avoid future consuming errors things